-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CI/Dockerfile: port 1.8 changes to 1.9 #1049
Conversation
This is the modern way of invoking Docker compose.
Add a script for switching UID/GID of the user inside the container. Use this to avoid making the directories the CI uses world-writable.
This removes some warning printouts in the tests.
Edit: first error was a merge-error from me, updated error and added the question about docker-compose.cleandb.yaml. Edit 2: tests were failing because they were using an image that did not contain the changes in this PR. Added a I don't know much about git, so I generally try to stay in my lane. I'm guessing it was a squash in the CI merge command into what is now commit 9579b4d. I don't think it's possible to avoid pain completely, but in general, I think it would be easier to take the pain and amend/fixup broken commits in pull requests and force-pushing so you get a "clean" PR/commit history, rather than adding commits to the PR and squashing everything when merging. With a reasonable commit hygiene, that strategy would reduce the size of merge conflicts, and that would make it easier to keep the two branches in sync. Commit 1c22b2c changes the docker-compose.db.yaml file, should the same changes have been made to docker-compose.cleandb.yaml? I don't see why this PR would make any change to these parts, but the failing CI job cannot find the datacube config:
Do you by any chance happen to know what I might have messed up? |
cc9e0ac
to
fff42e4
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop-1.9 #1049 +/- ##
===============================================
- Coverage 93.77% 93.27% -0.50%
===============================================
Files 46 53 +7
Lines 6573 7038 +465
===============================================
+ Hits 6164 6565 +401
- Misses 409 473 +64 |
Add a health check to compose and use that in the CI instead of the wait-for-db-script.
You make a good point, but the reality with open source is the contributors rarely do take the pain, and I don't have the time to do it for them so my habit is to squash-merge rather than tangle master more than it already is, especially while I'm also working on But now I know that's how you prefer to work, I'll try to make sure I don't squash your PRs in future! Thanks so much for all these PRs - your contributions are greatly appreciated. |
Cherry-pick the changes to CI/Dockerfile from 1.8 to 1.9. Cherry-picking commit 9579b4d gives a lot of conflicts, so make a separate small commit that removes the dash in
docker-compose
which are the necessary changes for this PR.📚 Documentation preview 📚: https://datacube-ows--1049.org.readthedocs.build/en/1049/